Merge commit 'upstream/0.3.0'
authorKan-Ru Chen <koster@debian.org>
Sat, 17 Dec 2011 08:37:02 +0000 (16:37 +0800)
committerKan-Ru Chen <koster@debian.org>
Sat, 17 Dec 2011 08:37:02 +0000 (16:37 +0800)

Trivial merge